Bug 554702 – gtkfilesystem leaks GError

Also fixes some "format not a string literal and no format arguments"
warnings.

svn path=/trunk/; revision=21611

diff --git a/ChangeLog b/ChangeLog
index 861d4396d43196b252fc74caac6387fc3c31ba6f..816e389ee8ebbeaf9f0ca0ae5acf89085420461b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-08  Christian Persch  <chpe@gnome.org>
+
+        Bug 554702 – gtkfilesystem leaks GError
+
+        * gtk/gtkfilesystem.c (_gtk_file_system_init): Free the GError.
+
 2008-10-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb):

diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index 0bd79b08f647fc191d724ba9810c9d91432cf62f..2b2d44a3bae5ac01a8d2ac0a7e4bc8bea86349f4 100644 (file)
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -323,7 +323,7 @@ save_bookmarks (GFile  *bookmarks_file,
                                NULL, FALSE, 0, NULL,
                                NULL, &error))
     {
-      g_critical (error->message);
+      g_critical ("%s", error->message);
       g_error_free (error);
     }
 
@@ -531,7 +531,10 @@ _gtk_file_system_init (GtkFileSystem *file_system)
                                                 G_FILE_MONITOR_NONE,
                                                 NULL, &error);
   if (error)
-    g_warning (error->message);
+    {
+      g_warning ("%s", error->message);
+      g_error_free (error);
+    }
   else
     g_signal_connect (priv->bookmarks_monitor, "changed",
                      G_CALLBACK (bookmarks_file_changed), file_system);
@@ -1362,7 +1365,10 @@ gtk_folder_constructed (GObject *object)
   priv->directory_monitor = g_file_monitor_directory (priv->folder_file, G_FILE_MONITOR_NONE, NULL, &error);
 
   if (error)
-    g_warning (error->message);
+    {
+      g_warning ("%s", error->message);
+      g_error_free (error);
+    }
   else
     g_signal_connect (priv->directory_monitor, "changed",
                      G_CALLBACK (directory_monitor_changed), object);